Moved from struct to openstruct