Added entity utilities