Version 1.8.5
Move constants from Common class to more specific classes (major refactoring)