Move General into each entity