Consistent use of fromApi throughout objects