Added initial support for SFA