Refactored and improved Teleport component