Some more functionality added