Improve how the duplicating methods work