Started work on entity providers