Adding support for external mounts