Made core changes as per suggestions.