Refactor fetching function, add got
Release 1.2.1