Just tweaked some of the code and added a new handler with corresponding models.