Add more metadata
Remove unneeded imports