Adding URL parameters support