Partial fix, Tag and other classes are now resolved. #SCL-6022 Comment