Updated model & mappers to database design 1.4