Added columns and such to entities