More integration with existing code