Updated to Nested Types