Refactored entity locators

Signed-off-by: Tom Wright <tom@inflatablecookie.com>