create_uri_source added and chek_list optimized