adding more helpers making datasource more secure