Made more variables configurable on initialisation