Closes #788 . Added YNO property