Moved solid properties to data