Further updates to armaturesys