Add S4 family support (2/3)