Add status messages
Change to work with public cluster