Reconciled complex types resolves #51