Adding data api guards/filters...