Refactoring, move enum to metadata.
Fixed Issue #26. Adding container status.