CLOUD-304 refactored classes