Added support for pre-created agents