Added url parsing
Interface improved