Allow a few more possibilities with imports