Use constructors instead of maker functions