Creator class changed a bit