Fix comment
Add checking for required properties