Dino refactoring