Some extra hooks and things