Move container status into separate class