manifest information expanded, code adjusted and refactored