Refactor old methods to use new methods
Refactor old methods to use new methods

pratyushmittal/cuttlefish,idlweb/cuttlefish,idlweb/cuttlefish,idlweb/cuttlefish,pratyushmittal/cuttlefish,pratyushmittal/cuttlefish,idlweb/cuttlefish,pratyushmittal/cuttlefish