Moved new Tuple to different package, removed duplicate code