Base: Separate out FW 2.1 functions