Add architecture and update catalog schemas