Fixed
refactor is remove singleton