Facade version ids fixed
Refactoring, cleanup, tests