Add some best practices