Added Stubbs for Chunk and Entity