Removed dependency with lazy