Available containers functionality and refactors