Added some more "infrastructure" to the system