Fixing and making extras dict