Improves performance and add mail