Needs at least 0.5.4