Polished for 1.0 release