More work on entity editor