Further steps to use Normandy added