Adding pub/sub interface, nothing more