Changed parts of the system to be more flexible