Added common core classes