Merge "Add more atoms to sysui module"