Moved to lazy loading db