Changed system and container definition ids