Integrated functionality from previous version