Update for S4 support