Added sone new classes