Simplify system definition