Adjusted keys and added packages