Changes to facilitate auto loading