Using the upstream init file and making things more configurable