Added additional values to return JSON