Putting back sublayer support