Add prefix support to unit parser