Integration with old code