Fixed some imports, added peer class