Moved lazy loader to dependencies.
Updated init file.