Add Sub/Pub functionality