Add flags and enable system