some enhancements based on the wadl itself