Improvements

https://github.com/mecha-cms/cms/issues/13