Add ability to skip mount