Es6 mod improvements