Improve input/output decorator handling