WIP add extension and mail agent