Added content management but not fully functionaled