ALIEN-514 First steps implementation