Adhoc-Support (Experimental)

This is a correction and little improvement of @igorcalabria's work.