Added scaffolded classes