Add validating datasource decorator