Changing to autowired constructors