Updated to work with schema 19