Archives refactored to use reddeer approach