Refactored to new malanee core plugins