Adapted version to 0.5.0.0