Added functionality to force attributes onto an entity