Added more functionality in parsing src