Removed dependency on Entity101