added extra checks for data types in Apps