Fixes #53 Add support for @EmptyCollectionIfNull