Some refactoring
Support for variable in converter