More explicit use of weave api