updated according to latest changes at AlphaLemon CMS