Moved variables into standalone holder