Changed logic of connector and stuff template