Fix issues, improve and implement Event delegate for extensible feature