Fixed https bug and add new classes