Version 1.5.1 or higher - refacoring (mainly extra namespace for constants)