More entity improvements