Update for 4.1

Don't defer it, always load. Fixes #1
Update for 4.1

Missing implementations