DEV: Add check of attributes