Add some hooks and metrics