Add force intermediate option