Made proper class