Added some callbacks