changed form mappers to interface system for simpler extedability