Added check if struct exists