Removing the hardcoded values and using datasources