Basic defs
Don't rely on having a scope
Update docs