Add support for variables and management functionality