API & Parser improvements