Feature/more specs