Comments fixes
Optional getter
Auto requirement
Auto requirement