Added lazy module.
Changed to used properties.