Add support for data ports