Entities integrated;
convertor methods changed