Added support for Structs and Const