Updated class based application template