Improve Metadata Support for properties and variable