API Update, Modularized, Improved device handling