Removed Office as Entity (BIG CHANGE)