Fixed to use content
Version up to 0.0.3