refactor eventnavigation schema and model