CS fixing
Adding version constants