Added support for lightweight struct objects