Added entity find function