Added support for SFA