Refactoring
New updates