Change model, DAO and Service interfaces, convertor update to work