Added class and domain tables for loading