Fixed modal VC handling + Added Constants.h/m