I'm not going to review this file right now because it's part of #302. That will have to be merged first and then these changes should go away. If there's differences between your version and Traian's version I suggest you work them out now to avoid delaying this process later on.