Changed the API a bit so the claims are simpler. Need to implement some type of implicits based solution around types in the claims map to support String, Date, Int etc.