package selector improvements
imports