Some refactoring added
manifest added