0.0.3 add selector support