Added more transitions, containers and stuff