Added core Entity, EntityTable classes