Havy refactoring