Feature/extend gitty