Change types to follow backend specifications, fix #25