Allow direct execution
Added configurable variables