FNMA enhancements