Working on support for federator