Refactored dotnav add-on