Can you pull out those constants Mesut? Should be a few minutes work. After that I'll merge the PR.