Add source encoding and removed tuples dependency