Added Start, End compoent, Connection selecting