added dot(.) support