Added store_url and cleanup