New package metadata layout
Mail: Added new stuff (but still not working properly)
Updated metadata