Some basic functionality added