Improving input/output and mapping