Added support for arm sf devices and enhancements