Add mechanism parsing