Remove Fields check by file/dir check and use isLoaded() method in project object