Change Container to a Class