- Added annotations etc. to get the components
  injected.