Add check if attribute is present