Added partial compound parser support