Adding generic factory class base and multiton pattern