Added handling of get parameters