Some features was added & the "Rest" class