Updated for Lineman 0.5.2