Changes as per community feedback