Added better fetching logic
Renamed command tp to teapot