Added supported types; Fixed OS X compatibility