Add more container validations
Remove the implementations