Added Creation class and other changes