Add my Extended classes
Fix some issues