Fixing issues with collecting domain properties. Formatting