Don't be frighten to have your code tighly integrated with the existing one, once the PR accepted it will be FreeRDP's code. So your addings should have the same look as the original code.