Removed field injection and changed constructor selection a little bit