Add s4utils as it is a common repo