Better token management + hooks system