Maturities refactor