commit: Add top-node/base-node options