Fix Status class into Container class