Added legacy shape and contrib modules