Add in all the getters so it will return properly in json
(cherry picked from commit 1bc6bd5)