Code refactoring
Following Base updates