Improve configurabillity of the script