Add GetHandler and test