WIP Add missing vars