Added initial support + testing for instance and static member variables