WIP: Add single slaves observer