Updated boilerplate, PSI module and new flags