Several modifications to make module work out of the box