Added custom core classes