Beginning to incorporate wadl information