Refactored: moved to addon