Minor
Return a BOOL instead of dictionary
Since the library requires autosynthesized accessors, add a check