Update skeleton and catalog to work with 0.12