Implemente support for ContentCommands

Change-Id: Icec06ef9e694739480d07e1dc038f19b1a5f300a