Changed to easily identifiable properties