Improve mount bind and remove Hibernate bind

Using normal macro for [@focus] Hibernate now.