Use class load

Fixes #1