Implemented lighter-common changes