added few scaffolds and validations