Removed lazyloader, implemented in injection