Update surfaces to use attributes