Mockups: Latest changes from main project