Fields are now ordered properly. Expanded BCL support.