Metadata update, python2.7 compatibility