Added entity helper, updated other helpers.