Added internal/external CL options and layer selection validation