Included Refactroing changes done to select_spec in common