[ADD] Demo data and minor validations