Add ls++ support