FALCON-288 - refactoring