Add support for cup
Make mount a bit more robust