Are there plans to refactor the code to use Unity Application Block?