Explicit bootstrap file
Re-instate usage of constants