Reduce hackery to a minimum