Added src files as for 1.6.2