As Erik suggested we can place this on the bootstrap po for autoloading