adding support for eval and pubsub