Removed funcy dependency