Replaced/refactored Nicole plugins