Working on smart hub