Updated to use Database_url