Implement unused tags
Refactor SystemController