More code additions