WADL refactored.