new development starts from snapshot version
added some missing definitions