Changed API to focus less on entity