- Fixed the Flattening by merging variables in the same class hierarchy