Added fixes for CLS Compliance