Product Cell improvements