Adding support for Guava and ContentService last scenarios