Castle Windsor added to the solution