Added null checking for ids and types
Added validation of the incoming data
Now a working austen example