Adding proper class calls