neon-1243 Refactoring based on espace work