Better structure for paper management