Better command loading