Add arrow autogeneration