Added support for "is loading" style syntax for containers - may be bit buggy