Updated best practices