Added more mandatory functionality