Added new scaffolding classes