Refactored changes to include bed tools