Updates from version v2.0.0a