New content class

Changed context storing in Content class + other.