small refactoring
locale support added to the models