System refactor adds