Merge "Add some new subsystems"