added ability to add contained variables in datatype declarations