Updated translation; Small CRUD refactoring (internal)