Add RequestListener + fix some bugs on synchronization