Load on init and fix namespacing issue