Added Properties into classes