Fix edge case when properties string ends with coma
Fix null exception
First step towards supporting Deferred: implementing Callbacks collections