Added more fields to Source model