Added paramaterized functionality to data access module