Mockups: bit more refactoring