Make publisher work on a more flexible way