Add filters to preload and presave

This makes it easier to extend without declaring stub classes