Misc changes

Add all the required values.