Added pub and mpub on the client