Add double system support