Moved a category
Added support for locale