Add re-exports support