Some basic changes
Required utility functions