Added Registry class & Generator class