Added GALEX support