Added url and query parsing