Prepared structure for Issue #58