Refectored classes to match