Added more special features