geometry container typedef fixing