Add data conditional check