Fixed contents extraction bug. Added greater parameter inference.