Add file support and basic tokens