Update initialization for new type signatures