Updated shape resolver to not override current shape