Comply with best practice